From ea7c64f537fdf8bbfe22013418f4e1bb847fa4d6 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Thu, 13 Feb 2014 01:55:01 +0000 Subject: [PATCH] Fixes for a number of minor warnings. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4734 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/dg-100.cc | 6 ++---- gpsbabel/exif.cc | 4 +++- gpsbabel/gopal.cc | 2 +- gpsbabel/humminbird.cc | 2 +- gpsbabel/jeeps/gpsserial.cc | 2 ++ gpsbabel/jeeps/jgpsutil.cc | 11 ++++------- gpsbabel/mmo.cc | 4 +--- gpsbabel/overlay.cc | 8 ++++---- gpsbabel/parse.cc | 2 +- gpsbabel/trackfilter.cc | 6 ++++-- gpsbabel/util.cc | 2 +- 11 files changed, 24 insertions(+), 25 deletions(-) diff --git a/gpsbabel/dg-100.cc b/gpsbabel/dg-100.cc index 0f1d04cbe..948c81a6b 100644 --- a/gpsbabel/dg-100.cc +++ b/gpsbabel/dg-100.cc @@ -181,11 +181,9 @@ dg100_log(const char* fmt, ...) { va_list ap; va_start(ap, fmt); - if (global_opts.debug_level < 1) { - return; + if (global_opts.debug_level > 0) { + vfprintf(stderr, fmt, ap); } - - vfprintf(stderr, fmt, ap); va_end(ap); } diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc index 3615120e6..cbb751d55 100644 --- a/gpsbabel/exif.cc +++ b/gpsbabel/exif.cc @@ -567,7 +567,6 @@ exif_read_app(exif_app_t* app) if (ifd == NULL) { return; } - if (ifd->next_ifd) { ifd = exif_read_ifd(app, IFD1, ifd->next_ifd, &exif_ifd_ofs, &gps_ifd_ofs, &inter_ifd_ofs); } @@ -580,6 +579,9 @@ exif_read_app(exif_app_t* app) if (inter_ifd_ofs) { ifd = exif_read_ifd(app, 4, inter_ifd_ofs, NULL, NULL, NULL); } + // The return values of exif_read_ifd above aren't actually used. + // Warning hush. + (void) ifd; } static void diff --git a/gpsbabel/gopal.cc b/gpsbabel/gopal.cc index 4b69dd43c..0d42558c4 100644 --- a/gpsbabel/gopal.cc +++ b/gpsbabel/gopal.cc @@ -149,7 +149,7 @@ gopal_rd_init(const char* fname) strncpy(&buff[0],&filename[2],8); } // in buff we should now have something wich looks like a valid date starting with YYYYMMDD - ck = (char*)strptime(buff, "%Y%m%d", &filenamedate); + /*ck = (char*)*/strptime(buff, "%Y%m%d", &filenamedate); // if (((ck == NULL) || (*ck != '\0') )&&!(optdate)) // fatal(MYNAME ": Invalid date in filename \"%s\", try to set manually using \"date\" switch!\n", buff); // /* else */ if (filenamedate.tm_year < 70) diff --git a/gpsbabel/humminbird.cc b/gpsbabel/humminbird.cc index 836899b05..829fba0f9 100644 --- a/gpsbabel/humminbird.cc +++ b/gpsbabel/humminbird.cc @@ -767,7 +767,7 @@ humminbird_track_head(const route_head* trk) // NEW_STRING: remove speare ctor below. name = mkshort(trkname_sh, QString(trk->rte_name)); - strncpy(trk_head->name, CSTR(name), sizeof(trk_head->name)); + strncpy(trk_head->name, CSTR(name), sizeof(trk_head->name)-1); be_write16(&trk_head->trk_num, trk->rte_num); } } diff --git a/gpsbabel/jeeps/gpsserial.cc b/gpsbabel/jeeps/gpsserial.cc index 68c4d028d..19ef8f8fd 100644 --- a/gpsbabel/jeeps/gpsserial.cc +++ b/gpsbabel/jeeps/gpsserial.cc @@ -82,6 +82,8 @@ void GPS_Serial_Error(const char* mb, ...) FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), 0, s, sizeof(msg) - b - 2, 0); GPS_Error(msg); + + va_end(ap); } int32 GPS_Serial_On(const char* port, gpsdevh** dh) diff --git a/gpsbabel/jeeps/jgpsutil.cc b/gpsbabel/jeeps/jgpsutil.cc index a9374c68a..775222434 100644 --- a/gpsbabel/jeeps/jgpsutil.cc +++ b/gpsbabel/jeeps/jgpsutil.cc @@ -506,15 +506,12 @@ void GPS_Error(const char* fmt, ...) va_list argp; va_start(argp, fmt); - if (!gps_error) { - return; + if (gps_error) { + fprintf(stderr, "[ERROR] "); + vfprintf(stderr, fmt, argp); + fprintf(stderr, "\n"); } - - fprintf(stderr, "[ERROR] "); - vfprintf(stderr, fmt, argp); - fprintf(stderr, "\n"); - va_end(argp); return; } diff --git a/gpsbabel/mmo.cc b/gpsbabel/mmo.cc index b99720c47..17f5c54e8 100644 --- a/gpsbabel/mmo.cc +++ b/gpsbabel/mmo.cc @@ -497,10 +497,8 @@ mmo_read_CObjWaypoint(mmo_data_t* data) DBG((sobj, "rtelinks = %d\n", rtelinks)); for (i = 0; i < rtelinks; i++) { - mmo_data_t* tmp; - DBG((sobj, "read rtelink number %d\n", i + 1)); - rtelink[i] = tmp = mmo_read_object(); + rtelink[i] = mmo_read_object(); } } diff --git a/gpsbabel/overlay.cc b/gpsbabel/overlay.cc index b0a6b77ce..1338416b5 100644 --- a/gpsbabel/overlay.cc +++ b/gpsbabel/overlay.cc @@ -268,17 +268,17 @@ static void ovl_read(void) } lineno++; line = lrtrim(line); - if ((pstr = strstr(line,"[Symbol "))!= NULL) { + if ((strstr(line,"[Symbol "))!= NULL) { sym_cnt++; isSection = SECTION_SYMBOL; - } else if ((pstr = strstr(line,"[Overlay]"))!= NULL) { + } else if ((strstr(line,"[Overlay]"))!= NULL) { isSection = SECTION_OVERLAY; } else if (isSection==SECTION_SYMBOL) { pstr = strtok(line,"="); - if (pstr!=NULL) { + if (pstr != NULL) { keyw = isKeyword(pstr,Keywords); pstr = strtok(NULL,"\n"); - if (pstr!=NULL) { + if (pstr != NULL) { switch (keyw) { case KEY_TYP : aktTyp = atoi(pstr); diff --git a/gpsbabel/parse.cc b/gpsbabel/parse.cc index 0fec10105..4b056eef6 100644 --- a/gpsbabel/parse.cc +++ b/gpsbabel/parse.cc @@ -156,7 +156,7 @@ parse_coordinates(const char* str, int datum, const grid_type grid, double* latitude, double* longitude, const char* module) { double lat, lon; - unsigned char lathemi, lonhemi; + unsigned char lathemi=0, lonhemi=0; int deg_lat, deg_lon, min_lat, min_lon; char map[3]; int utmz; diff --git a/gpsbabel/trackfilter.cc b/gpsbabel/trackfilter.cc index c37297258..1206d90b5 100644 --- a/gpsbabel/trackfilter.cc +++ b/gpsbabel/trackfilter.cc @@ -388,7 +388,7 @@ trackfilter_fill_track_list_cb(const route_head* track) /* callback for track_d static void trackfilter_split_init_rte_name(route_head* track, const QDateTime dt) { - char buff[128], tbuff[128]; + char tbuff[128]; struct tm tm; time_t time = dt.toUTC().toTime_t(); @@ -398,6 +398,8 @@ trackfilter_split_init_rte_name(route_head* track, const QDateTime dt) strftime(tbuff, sizeof(tbuff), "%Y%m%d%H%M%S", &tm) : strftime(tbuff, sizeof(tbuff), "%Y%m%d", &tm); + // TODO: this should be q QString. + char buff[128]; if ((opt_title != NULL) && (strlen(opt_title) > 0)) { if (strchr(opt_title, '%') != NULL) { strftime(buff, sizeof(buff), opt_title, &tm); @@ -405,7 +407,7 @@ trackfilter_split_init_rte_name(route_head* track, const QDateTime dt) snprintf(buff, sizeof(buff), "%s-%s", opt_title, tbuff); } } else if (!track->rte_name.isEmpty()) { - snprintf(buff, sizeof(buff), "%s-%s", CSTRc(track->rte_name), tbuff); + snprintf(buff, sizeof(buff) - 1, "%s-%s", CSTRc(track->rte_name), tbuff); } else { strncpy(buff, tbuff, sizeof(buff)); } diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc index df4b87f4d..ece38cc04 100644 --- a/gpsbabel/util.cc +++ b/gpsbabel/util.cc @@ -1089,7 +1089,7 @@ strsub(const char* s, const char* search, const char* replace) return NULL; } - d = (char*) xmalloc(len + rlen); + d = (char*) xmalloc(len + rlen + 1); /* Copy first part */ len = p - s; -- 2.30.2